Remove broken introspection bindings

They primarily existed to support GEGL, and there are more
solid wrappers around the related functions in GEGL now.

diff --git a/Makefile.am b/Makefile.am
index 700841450e1eb06b36ba4872e09e979a4cc93b4c..d2a4f2b890f601ce1726b41f553aac89e2eb4a77 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-#DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
 
 SUBDIRS = \
        babl            \
@@ -23,7 +22,6 @@ EXTRA_DIST = \
        NEWS                    \
        TODO                    \
        autogen.sh              \
-       m4/introspection.m4     \
        babl.pc.in
 
 DISTCLEANFILES = \

diff --git a/babl/Babl-0.1.gir.static b/babl/Babl-0.1.gir.static
deleted file mode 100644 (file)
index f6b41dd..0000000
--- a/babl/Babl-0.1.gir.static
+++ /dev/null
@@ -1,457 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file was automatically generated from C sources - DO NOT EDIT!
-To affect the contents of this file, edit the original C definitions,
-and/or use gtk-doc annotations.  -->
-<repository version="1.2"
-            xmlns="http://www.gtk.org/introspection/core/1.0"
-            xmlns:c="http://www.gtk.org/introspection/c/1.0"
-            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-  <namespace name="Babl"
-             version="0.1"
-             shared-library="libbabl-0.1.so.0"
-             c:identifier-prefixes="Babl"
-             c:symbol-prefixes="babl">
-    <record name="Object" c:type="Babl" disguised="1">
-      <doc xml:whitespace="preserve">The babl API is based around polymorphism and almost everything is
-a Babl object.</doc>
-    </record>
-    <callback name="FuncLinear" c:type="BablFuncLinear">
-      <return-value transfer-ownership="none">
-        <type name="glong" c:type="long"/>
-      </return-value>
-      <parameters>
-        <parameter name="src" transfer-ownership="none">
-          <type name="utf8" c:type="const char*"/>
-        </parameter>
-        <parameter name="dst" transfer-ownership="none">
-          <type name="utf8" c:type="char*"/>
-        </parameter>
-        <parameter name="n" transfer-ownership="none">
-          <type name="glong" c:type="long"/>
-        </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="3">
-          <type name="gpointer" c:type="void*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="FuncPlanar" c:type="BablFuncPlanar">
-      <return-value transfer-ownership="none">
-        <type name="glong" c:type="long"/>
-      </return-value>
-      <parameters>
-        <parameter name="src_bands" transfer-ownership="none">
-          <type name="gint" c:type="int"/>
-        </parameter>
-        <parameter name="src" transfer-ownership="none">
-          <type name="utf8" c:type="const char*"/>
-        </parameter>
-        <parameter name="src_pitch" transfer-ownership="none">
-          <type name="gint" c:type="int"/>
-        </parameter>
-        <parameter name="dst_bands" transfer-ownership="none">
-          <type name="gint" c:type="int"/>
-        </parameter>
-        <parameter name="dst" transfer-ownership="none">
-          <type name="utf8" c:type="char*"/>
-        </parameter>
-        <parameter name="dst_pitch" transfer-ownership="none">
-          <type name="gint" c:type="int"/>
-        </parameter>
-        <parameter name="n" transfer-ownership="none">
-          <type name="glong" c:type="long"/>
-        </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="7">
-          <type name="gpointer" c:type="void*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <constant name="MAJOR_VERSION" value="0" c:type="BABL_MAJOR_VERSION">
-      <type name="gint" c:type="gint"/>
-    </constant>
-    <constant name="MICRO_VERSION" value="11" c:type="BABL_MICRO_VERSION">
-      <type name="gint" c:type="gint"/>
-    </constant>
-    <constant name="MINOR_VERSION" value="1" c:type="BABL_MINOR_VERSION">
-      <type name="gint" c:type="gint"/>
-    </constant>
-    <function name="component"
-              c:identifier="babl_component"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="name" transfer-ownership="none">
-          <type name="utf8" c:type="const char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_new"
-              c:identifier="babl_component_new"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="first_arg" transfer-ownership="none">
-          <type name="gpointer" c:type="void*"/>
-        </parameter>
-        <parameter transfer-ownership="none">
-          <varargs>
-          </varargs>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="conversion_new"
-              c:identifier="babl_conversion_new"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="first_arg" transfer-ownership="none">
-          <type name="gpointer" c:type="void*"/>
-        </parameter>
-        <parameter transfer-ownership="none">
-          <varargs>
-          </varargs>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="exit" c:identifier="babl_exit">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="fish" c:identifier="babl_fish" introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="source_format" transfer-ownership="none">
-          <type name="gpointer" c:type="void*"/>
-        </parameter>
-        <parameter name="destination_format" transfer-ownership="none">
-          <type name="gpointer" c:type="void*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="format" c:identifier="babl_format" introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="name" transfer-ownership="none">
-          <type name="utf8" c:type="const char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="format_get_bytes_per_pixel"
-              c:identifier="babl_format_get_bytes_per_pixel"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="gint" c:type="int"/>
-      </return-value>
-      <parameters>
-        <parameter name="format" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="format_get_model"
-              c:identifier="babl_format_get_model"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="format" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="format_get_n_components"
-              c:identifier="babl_format_get_n_components"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="gint" c:type="int"/>
-      </return-value>
-      <parameters>
-        <parameter name="format" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="format_get_type"
-              c:identifier="babl_format_get_type"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="format" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-        <parameter name="component_index" transfer-ownership="none">
-          <type name="gint" c:type="int"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="format_has_alpha"
-              c:identifier="babl_format_has_alpha"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="gint" c:type="int"/>
-      </return-value>
-      <parameters>
-        <parameter name="format" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="format_is_format_n"
-              c:identifier="babl_format_is_format_n"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="gint" c:type="int"/>
-      </return-value>
-      <parameters>
-        <parameter name="format" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="format_is_palette"
-              c:identifier="babl_format_is_palette"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="gint" c:type="int"/>
-      </return-value>
-      <parameters>
-        <parameter name="format" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="format_n" c:identifier="babl_format_n" introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-        <parameter name="components" transfer-ownership="none">
-          <type name="gint" c:type="int"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="format_new"
-              c:identifier="babl_format_new"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="first_arg" transfer-ownership="none">
-          <type name="gpointer" c:type="void*"/>
-        </parameter>
-        <parameter transfer-ownership="none">
-          <varargs>
-          </varargs>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="get_name" c:identifier="babl_get_name" introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="utf8" c:type="const char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="babl" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="get_user_data"
-              c:identifier="babl_get_user_data"
-              introspectable="0">
-      <return-value>
-        <type name="gpointer" c:type="void*"/>
-      </return-value>
-      <parameters>
-        <parameter name="babl" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="get_version" c:identifier="babl_get_version">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="major" transfer-ownership="none">
-          <type name="gint" c:type="int*"/>
-        </parameter>
-        <parameter name="minor" transfer-ownership="none">
-          <type name="gint" c:type="int*"/>
-        </parameter>
-        <parameter name="micro" transfer-ownership="none">
-          <type name="gint" c:type="int*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="init" c:identifier="babl_init">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="model" c:identifier="babl_model" introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="name" transfer-ownership="none">
-          <type name="utf8" c:type="const char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="model_new"
-              c:identifier="babl_model_new"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="first_arg" transfer-ownership="none">
-          <type name="gpointer" c:type="void*"/>
-        </parameter>
-        <parameter transfer-ownership="none">
-          <varargs>
-          </varargs>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="new_palette"
-              c:identifier="babl_new_palette"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="name" transfer-ownership="none">
-          <type name="utf8" c:type="const char*"/>
-        </parameter>
-        <parameter name="format_u8" transfer-ownership="none">
-          <type name="Object" c:type="const Babl**"/>
-        </parameter>
-        <parameter name="format_u8_with_alpha" transfer-ownership="none">
-          <type name="Object" c:type="const Babl**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="palette_reset"
-              c:identifier="babl_palette_reset"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="babl" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="palette_set_palette"
-              c:identifier="babl_palette_set_palette"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="babl" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-        <parameter name="format" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-        <parameter name="data" transfer-ownership="none">
-          <type name="gpointer" c:type="void*"/>
-        </parameter>
-        <parameter name="count" transfer-ownership="none">
-          <type name="gint" c:type="int"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="process" c:identifier="babl_process" introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="glong" c:type="long"/>
-      </return-value>
-      <parameters>
-        <parameter name="babl_fish" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-        <parameter name="source" transfer-ownership="none">
-          <type name="gpointer" c:type="void*"/>
-        </parameter>
-        <parameter name="destination" transfer-ownership="none">
-          <type name="gpointer" c:type="void*"/>
-        </parameter>
-        <parameter name="n" transfer-ownership="none">
-          <type name="glong" c:type="long"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="sampling" c:identifier="babl_sampling" introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="horizontal" transfer-ownership="none">
-          <type name="gint" c:type="int"/>
-        </parameter>
-        <parameter name="vertical" transfer-ownership="none">
-          <type name="gint" c:type="int"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="set_user_data"
-              c:identifier="babl_set_user_data"
-              introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="babl" transfer-ownership="none">
-          <type name="Object" c:type="const Babl*"/>
-        </parameter>
-        <parameter name="data" transfer-ownership="none">
-          <type name="gpointer" c:type="void*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type" c:identifier="babl_type" introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="name" transfer-ownership="none">
-          <type name="utf8" c:type="const char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_new" c:identifier="babl_type_new" introspectable="0">
-      <return-value transfer-ownership="none">
-        <type name="Object" c:type="const Babl*"/>
-      </return-value>
-      <parameters>
-        <parameter name="first_arg" transfer-ownership="none">
-          <type name="gpointer" c:type="void*"/>
-        </parameter>
-        <parameter transfer-ownership="none">
-          <varargs>
-          </varargs>
-        </parameter>
-      </parameters>
-    </function>
-  </namespace>
-</repository>

diff --git a/babl/Makefile.am b/babl/Makefile.am
index 976b1e0e385c09851c103eafdd2f8364b56f00d3..5d0c1f196de2896e208d4fd2d9d9674ee188e7eb 100644 (file)
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -87,61 +87,5 @@ libbabl_@BABL_API_VERSION@_la_LDFLAGS=               \
        ${no_undefined} $(MATH_LIB)     \
        -version-info $(BABL_LIBRARY_VERSION)
 
-# GObject Introspection
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-
-if HAVE_INTROSPECTION
-
-if HAVE_GI_RENAME_TO
-Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS) $(c_sources) $(srcdir)/Makefile.am libbabl-@BABL_API_VERSION@.la
-       $(INTROSPECTION_SCANNER) -v --warn-all \
-           --namespace Babl --nsversion=$(BABL_API_VERSION) \
-            --add-include-path=$(srcdir) --add-include-path=. \
-            --library=$(builddir)/libbabl-$(BABL_API_VERSION).la \
-            --libtool="$(LIBTOOL)" \
-            --output $@ \
-            -DBABL_IS_BEING_COMPILED \
-           -I$(top_srcdir) \
-           -I$(top_builddir) \
-           $(addprefix $(srcdir)/, $(libinc_hdrs)) \
-           $(addprefix $(builddir)/, $(libinc_generated_hdrs)) \
-           $(addprefix $(srcdir)/, $(c_sources))
-
-else # HAVE_GI_RENAME_TO
-# If the "rename to" gobject introspection annotation is not respected (GI <= 1.33.4)
-# we have to use a pre-generated .gir file. See https://bugzilla.gnome.org/show_bug.cgi?id=673422
-# and https://bugzilla.gnome.org/show_bug.cgi?id=675985
-Babl-$(BABL_API_VERSION).gir:
-       cp $@.static $@
-
-endif # HAVE_GI_RENAME_TO
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = Babl-$(BABL_API_VERSION).gir
-
-typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = Babl-$(BABL_API_VERSION).typelib
-
-%.typelib: %.gir
-       LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) \
-        --includedir=$(srcdir) \
-        --includedir=$(top_builddir)/babl \
-        $(G_IR_COMPILER_OPTS) \
-        $< -o $@
-
-if HAVE_VALA
-babl-$(BABL_API_VERSION).vapi: Babl-$(BABL_API_VERSION).gir
-       $(VAPIGEN) --library=babl-$(BABL_API_VERSION) Babl-$(BABL_API_VERSION).gir
-
-vapidir=$(datadir)/vala/vapi
-vapi_DATA = babl-$(BABL_API_VERSION).vapi
-
-endif # HAVE_VALA
-
-endif # HAVE_INTROSPECTION
-
 EXTRA_DIST = $(gir_DATA)
 CLEANFILES = $(gir_DATA) $(typelibs_DATA) $(vapi_DATA)

diff --git a/configure.ac b/configure.ac
index 8d3826a4b8d27a995428daa1c128dc4ab7f37e12..4fe66b1a3928b3ba5f26e62e534c68c1d1ba434f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -61,34 +61,6 @@ AC_SUBST(BABL_API_VERSION)
 BABL_RELEASE=babl_api_version
 AC_SUBST(BABL_RELEASE)
 
-# GObject Introspection
-GOBJECT_INTROSPECTION_CHECK([0.10])
-
-# Check whether g-ir-scanner respects "rename to" annotation
-PKG_CHECK_MODULES([GI_1_33_5], [gobject-introspection-1.0 >= 1.33.5],
-   [have_gi_rename_to=true],
-   [have_gi_rename_to=false]
-)
-AM_CONDITIONAL(HAVE_GI_RENAME_TO, [test x$have_gi_rename_to = xtrue])
-
-# Vala
-AC_ARG_WITH(vala, [  --without-vala         build without Vala support])
-
-have_vapigen="no"
-if test "x$with_vala" != "xno"; then
-
-  AC_PATH_PROG(VAPIGEN, vapigen, no)
-  if test "$VAPIGEN" = "no"; then
-    have_vapigen="no  (vapigen executable not found)"
-    AC_MSG_RESULT([*** Check for vapigen failed.])
-  else
-    have_vapigen="yes"
-  fi
-fi
-
-have_vala=$have_vapigen
-AM_CONDITIONAL(HAVE_VALA, test "$have_vala" = "yes")
-
 dnl The symbol BABL_UNSTABLE is defined above for substitution in
 dnl Makefiles and conditionally defined here as a preprocessor symbol
 dnl and automake conditional.

diff --git a/m4/introspection.m4 b/m4/introspection.m4
deleted file mode 100644 (file)
index 84e2c61..0000000
--- a/m4/introspection.m4
+++ /dev/null
@@ -1,94 +0,0 @@
-dnl -*- mode: autoconf -*-
-dnl Copyright 2009 Johan Dahlin
-dnl
-dnl This file is free software; the author(s) gives unlimited
-dnl permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-
-# serial 1
-
-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-[
-    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-
-    dnl enable/disable introspection
-    m4_if([$2], [require],
-    [dnl
-        enable_introspection=yes
-    ],[dnl
-        AC_ARG_ENABLE(introspection,
-                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-                                 [Enable introspection for this build]),, 
-                                 [enable_introspection=no])
-    ])dnl
-
-    AC_MSG_CHECKING([for gobject-introspection])
-
-    dnl presence/version checking
-    AS_CASE([$enable_introspection],
-    [no], [dnl
-        found_introspection="no (disabled, use --enable-introspection to enable)"
-    ],dnl
-    [yes],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-                         found_introspection=yes,
-                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-    ],dnl
-    [auto],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-    ],dnl
-    [dnl       
-        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-    ])dnl
-
-    AC_MSG_RESULT([$found_introspection])
-
-    INTROSPECTION_SCANNER=
-    INTROSPECTION_COMPILER=
-    INTROSPECTION_GENERATE=
-    INTROSPECTION_GIRDIR=
-    INTROSPECTION_TYPELIBDIR=
-    if test "x$found_introspection" = "xyes"; then
-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-    fi
-    AC_SUBST(INTROSPECTION_SCANNER)
-    AC_SUBST(INTROSPECTION_COMPILER)
-    AC_SUBST(INTROSPECTION_GENERATE)
-    AC_SUBST(INTROSPECTION_GIRDIR)
-    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-    AC_SUBST(INTROSPECTION_CFLAGS)
-    AC_SUBST(INTROSPECTION_LIBS)
-    AC_SUBST(INTROSPECTION_MAKEFILE)
-
-    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-])
-
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-
-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-])
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-
-
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-])

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5f7e5b226706262ad93fb963c43fbef086ba4c20..709bd84457f9a670a43bf881c0e4779e203e4e8b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,14 +23,8 @@ C_TESTS =                            \
        cairo-RGB24             \
        $(CONCURRENCY_STRESS_TEST)
 
-if HAVE_INTROSPECTION
-INTROSPECTION_TESTS = \
-       introspection.py
-endif
-
 TESTS = \
-       $(C_TESTS) \
-       $(INTROSPECTION_TESTS)
+       $(C_TESTS)
 
 TESTS_ENVIRONMENT = LD_LIBRARY_PATH=$(top_builddir)/babl:$LD_LIBRARY_PATH GI_TYPELIB_PATH=$(top_builddir)/babl BABL_PATH=$(top_builddir)/extensions/.libs
 
@@ -44,9 +38,6 @@ LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \
 
 EXTRA_DIST=common.inc
 
-dist_noinst_SCRIPTS = \
-       introspection.py
-
 noinst_PROGRAMS =              \
        introspect              \
        babl_fish_path_fitness  \

diff --git a/tests/introspection.py b/tests/introspection.py
deleted file mode 100755 (executable)
index 1e855aa..0000000
--- a/tests/introspection.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-
-import unittest
-
-class TestSanity(unittest.TestCase):
-
-    def test_import(self):
-        import gi
-        from gi.repository import Babl
-
-    def test_init(self):
-        import gi
-        from gi.repository import Babl
-        Babl.init()
-        Babl.exit()
-
-if __name__ == '__main__':
-    unittest.main()